{non-gerrit}/qt-labs/widgets-ng.git/projects.pro, branch master

Remove last vestiges of the qtusagereporter.

2009-08-24T06:35:59+00:00

Reviewed-by: Trust Me

Enabled QtUiTools and related example building for Symbian OS.

2009-07-27T11:13:40+00:00

Merge commit 'qt/master-stable' into 4.6-merged

2009-06-30T09:21:56+00:00

Conflicts:
	.gitignore
	configure.exe
	src/corelib/concurrent/qtconcurrentthreadengine.h
	src/corelib/global/qnamespace.h
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qwidget.h
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkaccesshttpbackend.cpp
	tests/auto/network-settings.h
	tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro
	tests/auto/qvariant/tst_qvariant.cpp

Merge commit 'qt/master-stable' into 4.6-stable

2009-06-25T13:49:53+00:00

Bring Qt 4.6 into the Qt-S60 repo.

Conflicts:
	configure.exe
	mkspecs/features/qttest_p4.prf
	qmake/generators/makefile.cpp
	src/corelib/io/qdir.cpp
	src/corelib/io/qprocess.h
	src/corelib/kernel/qcoreevent.h
	src/corelib/kernel/qobject.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/corelib/thread/qthread_p.h
	src/corelib/tools/qvector.h
	src/gui/dialogs/qdialog.cpp
	src/gui/dialogs/qfiledialog.cpp
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qmessagebox.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/graphicsview/qgraphicsview.cpp
	src/gui/image/qpixmapcache.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/painting/qdrawhelper.cpp
	src/gui/painting/qpaintengine_raster.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qmenubar.cpp
	src/network/socket/qlocalserver.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/qimagereader/tst_qimagereader.cpp
	tests/auto/qitemdelegate/tst_qitemdelegate.cpp
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qpixmap/qpixmap.pro

Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt

2009-06-18T14:51:35+00:00

Conflicts:
	configure.exe
	tests/auto/qpainter/tst_qpainter.cpp
	translations/qt_ru.ts

revert built-time qm generation

2009-06-16T15:55:51+00:00

it simply breaks too much (embedded builds in particular).
will come up with something better in master.

note however, that the .qm files do NOT return to the repository. the
release manager needs to run "make qm" before packaging, just like
Qt-from-git users who want translations do (i.e., almost nobody).

Reviewed-by: Jason McDonald

Merge license header changes from 4.5

2009-06-16T15:15:48+00:00

fix qm build

2009-06-15T09:14:48+00:00

so "qmake -r && make" worked fine ... but configure does not simply run
"qmake -r".
also, now we have to build lrelease even when we don't build the other
tools.

Reviewed-by: Jason McDonald
Reviewed-by: mariusSO

Merge commit 'origin/4.5'

2009-06-12T12:35:46+00:00

Conflicts:
	demos/boxes/glshaders.cpp
	src/gui/graphicsview/qgraphicsitem.cpp
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tools/linguist/shared/cpp.cpp
	translations/linguist_ja.qm
	translations/qt_ru.qm

turn qm generation into a build time target

2009-06-11T13:52:41+00:00

consequently, remove the qm files from the repository

this uses some really black magic to convince qmake to do the right
thing. this will be fixed properly in a later version.

Reviewed-by: mariusSO